Merge branch 'upstream'
authorBernd Zeimetz <bernd@bzed.de>
Sun, 25 Oct 2015 19:36:02 +0000 (20:36 +0100)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 25 Oct 2015 19:36:02 +0000 (20:36 +0100)
commitfda6f38d8b62b987e45d80819934c8992abe01a6
tree1ebf11a4710e6f72d277a265452adbfc0b613f0b
parent73f8eebcb5e3e3c092a39b56d28dcc4ee2a59da7
parentcddf3aae307d3bd1268f24514acf3a53f502d060
Merge branch 'upstream'